Merged.
authoremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Fri, 7 Apr 2006 10:52:00 +0000 (11:52 +0100)
committeremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Fri, 7 Apr 2006 10:52:00 +0000 (11:52 +0100)
commit547a12d6d3ffa6110539dd5afd232e12959acde7
tree9308d1b36e03407c557f86bd8a0bbf88a10607e5
parent45bd0044c4481f4d0469cdaea78b22ae08a33412
parent2ec558319c08c178032bb1fe5ae7d10ff680c56f
Merged.